From 27839dfd21b55745d868505063b47b43f26f2f0a Mon Sep 17 00:00:00 2001
From: Lucien Greathouse <me@lpghatguy.com>
Date: Tue, 3 Sep 2019 14:00:31 -0700
Subject: [PATCH] Shuffle web_interface into web::interface

---
 src/lib.rs                                 | 1 -
 src/web/api.rs                             | 8 +++++---
 src/{web_interface.rs => web/interface.rs} | 0
 src/web/mod.rs                             | 1 +
 src/web/ui.rs                              | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)
 rename src/{web_interface.rs => web/interface.rs} (100%)

diff --git a/src/lib.rs b/src/lib.rs
index 9c4ba3f1..f596b463 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,6 @@
 mod impl_from;
 
 pub mod commands;
-pub mod web_interface;
 
 // This module is only public for the purpose of testing right now, and won't be
 // part of the first version of the Rojo API.
diff --git a/src/web/api.rs b/src/web/api.rs
index d14a0020..7f95e9aa 100644
--- a/src/web/api.rs
+++ b/src/web/api.rs
@@ -10,9 +10,11 @@ use rbx_dom_weak::RbxId;
 
 use crate::{
     serve_session::ServeSession,
-    web::util::response_json,
-    web_interface::{
-        ReadResponse, ServerInfoResponse, SubscribeResponse, PROTOCOL_VERSION, SERVER_VERSION,
+    web::{
+        interface::{
+            ReadResponse, ServerInfoResponse, SubscribeResponse, PROTOCOL_VERSION, SERVER_VERSION,
+        },
+        util::response_json,
     },
 };
 
diff --git a/src/web_interface.rs b/src/web/interface.rs
similarity index 100%
rename from src/web_interface.rs
rename to src/web/interface.rs
diff --git a/src/web/mod.rs b/src/web/mod.rs
index 613c2d94..df4c0127 100644
--- a/src/web/mod.rs
+++ b/src/web/mod.rs
@@ -1,4 +1,5 @@
 mod api;
+mod interface;
 mod ui;
 mod util;
 
diff --git a/src/web/ui.rs b/src/web/ui.rs
index 03d0a69f..01471839 100644
--- a/src/web/ui.rs
+++ b/src/web/ui.rs
@@ -6,7 +6,7 @@ use futures::{future, Future};
 use hyper::{header, service::Service, Body, Method, Request, Response, StatusCode};
 use ritz::html;
 
-use crate::{serve_session::ServeSession, web_interface::SERVER_VERSION};
+use crate::{serve_session::ServeSession, web::interface::SERVER_VERSION};
 
 static HOME_CSS: &str = include_str!("../../assets/index.css");