diff --git a/src/files.rs b/src/files.rs
index 22d2e21..cf31277 100644
--- a/src/files.rs
+++ b/src/files.rs
@@ -22,11 +22,11 @@ use crate::{create_thumbnails, AppState};
 use crate::data::SortType::{NameAsc};
 use crate::error::IntoHttpError;
 use crate::tags::TagDao;
-use crate::video::StreamActor;
 use path_absolutize::*;
 use rand::prelude::SliceRandom;
 use rand::thread_rng;
 use serde::Deserialize;
+use crate::video::actors::StreamActor;
 
 pub async fn list_photos<TagD: TagDao, FS: FileSystemAccess>(
     _: Claims,
@@ -418,7 +418,6 @@ mod tests {
         use crate::{
             data::{Claims, PhotosResponse},
             testhelpers::BodyReader,
-            video::StreamActor,
             AppState,
         };
 
diff --git a/src/main.rs b/src/main.rs
index b46338d..a5f7e39 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -44,6 +44,9 @@ use crate::service::ServiceBuilder;
 use crate::state::AppState;
 use crate::tags::*;
 use crate::video::*;
+use crate::video::actors::{
+    create_playlist, generate_video_thumbnail, ProcessMessage, ScanDirectoryMessage,
+};
 
 mod auth;
 mod data;
diff --git a/src/state.rs b/src/state.rs
index 5f6501c..b3ad608 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -1,7 +1,6 @@
-use crate::video::{PlaylistGenerator, VideoPlaylistManager};
-use crate::StreamActor;
 use actix::{Actor, Addr};
 use std::{env, sync::Arc};
+use crate::video::actors::{PlaylistGenerator, StreamActor, VideoPlaylistManager};
 
 pub struct AppState {
     pub stream_manager: Arc<Addr<StreamActor>>,
diff --git a/src/video.rs b/src/video/actors.rs
similarity index 100%
rename from src/video.rs
rename to src/video/actors.rs