Reorganize modules

Instead of separating functionality into layout and library, everything lives in the library now. This way, related things live side by side and there are no duplicate file names in the two directories.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/lib.rs b/src/lib.rs
index 2ae87fc6..41b2e88b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -33,6 +33,7 @@ pub mod diag;
 pub mod eval;
 pub mod export;
 pub mod font;
+pub mod frame;
 pub mod geom;
 pub mod image;
 pub mod layout;
@@ -49,10 +50,11 @@ use std::rc::Rc;
 use crate::diag::TypResult;
 use crate::eval::{Module, Scope};
 use crate::font::FontStore;
+use crate::frame::Frame;
 use crate::image::ImageStore;
+use crate::layout::PageNode;
 #[cfg(feature = "layout-cache")]
 use crate::layout::{EvictionPolicy, LayoutCache};
-use crate::layout::{Frame, PageNode};
 use crate::loading::Loader;
 use crate::source::{SourceId, SourceStore};
 use crate::style::Style;