1 files changed, 9 insertions, 8 deletions
diff --git a/src/datatype/mod.rs b/src/datatype/mod.rs
index 8a9ca4e..71e7e0a 100644
--- a/src/datatype/mod.rs
+++ b/src/datatype/mod.rs
@@ -5,22 +5,23 @@ pub mod dbus;
 pub mod error;
 pub mod event;
 pub mod json_rpc;
-pub mod package;
-pub mod system_info;
+pub mod network;
+pub mod shell;
 pub mod update_report;
-pub mod url;
+pub mod update_request;
 
-pub use self::auth::{AccessToken, Auth, ClientId, ClientSecret, ClientCredentials};
+pub use self::auth::{AccessToken, Auth, ClientCredentials};
 pub use self::command::Command;
 pub use self::config::{AuthConfig, CoreConfig, Config, DBusConfig, DeviceConfig,
                        GatewayConfig, RviConfig};
 pub use self::error::Error;
 pub use self::event::Event;
 pub use self::json_rpc::{RpcRequest, RpcOk, RpcErr};
-pub use self::package::{ChunkReceived, DownloadStarted, DownloadComplete, Package,
-                        PendingUpdateRequest, UpdateAvailable, UpdateRequestId};
-pub use self::system_info::SystemInfo;
+pub use self::network::{Method, SocketAddr, Url};
+pub use self::shell::system_info;
 pub use self::update_report::{DeviceReport, InstalledFirmware, InstalledPackage,
                               InstalledSoftware, OperationResult, UpdateResultCode,
                               UpdateReport};
-pub use self::url::{Method, Url};
+pub use self::update_request::{ChunkReceived, DownloadComplete, DownloadFailed,
+                               DownloadStarted, Package, UpdateAvailable,
+                               UpdateRequest, UpdateRequestId, UpdateRequestStatus};