refactor

2 files changed, 7 insertions, 4 deletions

diff --git a/evc/src/bin/decode.rs b/evc/src/bin/decode.rs
index b15467f..b7dd4e1 100644
--- a/evc/src/bin/decode.rs
+++ b/evc/src/bin/decode.rs
@@ -2,8 +2,12 @@
 use anyhow::Context;
 use clap::Parser;
 use evc::{
-    block::Block, codec::decode::decode_block, frame::Frame, header::Header, pixel::Pixel,
-    ser::Source, view::View,
+    block::Block,
+    codec::decode::decode_block,
+    format::{header::Header, ser::Source},
+    frame::Frame,
+    helpers::pixel::Pixel,
+    view::View,
 };
 use log::info;
 use std::io::{BufReader, BufWriter};
diff --git a/evc/src/bin/encode.rs b/evc/src/bin/encode.rs
index 611347f..f81bb5e 100644
--- a/evc/src/bin/encode.rs
+++ b/evc/src/bin/encode.rs
@@ -5,10 +5,9 @@ use evc::{
         decode::decode_block,
         encode::{encode_block, EncodeConfig},
     },
+    format::{header::Header, ser::Sink},
     frame::Frame,
-    header::Header,
     helpers::vector::Vec2,
-    ser::Sink,
 };
 use log::info;
 use std::io::{BufReader, BufWriter};