More restructuring

3 files changed, 7 insertions, 6 deletions

diff --git a/src/eval/layout.rs b/src/eval/layout.rs
index 02912544..135e5e04 100644
--- a/src/eval/layout.rs
+++ b/src/eval/layout.rs
@@ -9,7 +9,8 @@ use crate::diag::TypResult;
 use crate::eval::StyleChain;
 use crate::frame::{Element, Frame, Geometry, Shape, Stroke};
 use crate::geom::{Align, Length, Linear, Paint, Point, Sides, Size, Spec, Transform};
-use crate::library::layout::{AlignNode, MoveNode, PadNode};
+use crate::library::graphics::MoveNode;
+use crate::library::layout::{AlignNode, PadNode};
 use crate::util::Prehashed;
 use crate::Context;
 
diff --git a/src/eval/mod.rs b/src/eval/mod.rs
index f8b4b0f0..590b8463 100644
--- a/src/eval/mod.rs
+++ b/src/eval/mod.rs
@@ -155,7 +155,7 @@ impl Eval for MathNode {
     type Output = Template;
 
     fn eval(&self, _: &mut Context, _: &mut Scopes) -> EvalResult<Self::Output> {
-        Ok(Template::show(library::elements::MathNode {
+        Ok(Template::show(library::math::MathNode {
             formula: self.formula.clone(),
             display: self.display,
         }))
@@ -166,7 +166,7 @@ impl Eval for HeadingNode {
     type Output = Template;
 
     fn eval(&self, ctx: &mut Context, scp: &mut Scopes) -> EvalResult<Self::Output> {
-        Ok(Template::show(library::elements::HeadingNode {
+        Ok(Template::show(library::structure::HeadingNode {
             body: self.body().eval(ctx, scp)?,
             level: self.level(),
         }))
@@ -177,7 +177,7 @@ impl Eval for ListNode {
     type Output = Template;
 
     fn eval(&self, ctx: &mut Context, scp: &mut Scopes) -> EvalResult<Self::Output> {
-        Ok(Template::List(library::elements::ListItem {
+        Ok(Template::List(library::structure::ListItem {
             number: None,
             body: Box::new(self.body().eval(ctx, scp)?),
         }))
@@ -188,7 +188,7 @@ impl Eval for EnumNode {
     type Output = Template;
 
     fn eval(&self, ctx: &mut Context, scp: &mut Scopes) -> EvalResult<Self::Output> {
-        Ok(Template::Enum(library::elements::ListItem {
+        Ok(Template::Enum(library::structure::ListItem {
             number: self.number(),
             body: Box::new(self.body().eval(ctx, scp)?),
         }))
diff --git a/src/eval/template.rs b/src/eval/template.rs
index 94cc0aff..3e88b6d7 100644
--- a/src/eval/template.rs
+++ b/src/eval/template.rs
@@ -10,9 +10,9 @@ use super::{
     StyleMap, StyleVecBuilder,
 };
 use crate::diag::StrResult;
-use crate::library::elements::{ListItem, ListKind, ListNode, ORDERED, UNORDERED};
 use crate::library::layout::{FlowChild, FlowNode, PageNode, PlaceNode, SpacingKind};
 use crate::library::prelude::*;
+use crate::library::structure::{ListItem, ListKind, ListNode, ORDERED, UNORDERED};
 use crate::library::text::{DecoNode, ParChild, ParNode, TextNode, UNDERLINE};
 use crate::util::EcoString;