From 8dadcc50048b79a04625463a3328ef546aa1b7be Mon Sep 17 00:00:00 2001
From: Joe McCain III <jo3mccain@icloud.com>
Date: Sat, 29 Oct 2022 00:05:03 +0000
Subject: [PATCH 1/4] Update

---
 .dockerignore                                 | 48 -------------------
 Dockerfile                                    | 27 -----------
 core/Cargo.toml                               | 11 +----
 core/src/{core => }/contexts/context.rs       |  0
 core/src/{core => }/contexts/mod.rs           |  0
 core/src/core/mod.rs                          | 15 ------
 core/src/{core => }/errors/error.rs           |  0
 core/src/{core => }/errors/mod.rs             |  0
 core/src/{core => }/events/event.rs           |  0
 core/src/{core => }/events/mod.rs             |  0
 core/src/{core => }/events/variants.rs        |  0
 core/src/lib.rs                               | 12 +++--
 core/src/misc/mod.rs                          | 10 ++++
 core/src/{core => misc}/primitives.rs         |  0
 core/src/{core => misc}/utils.rs              |  1 -
 core/src/{core => }/states/mod.rs             |  0
 core/src/{core => }/states/state.rs           |  0
 core/src/{core => }/times/mod.rs              |  0
 core/src/{core => }/times/timestamp.rs        |  0
 scsys/Cargo.toml                              | 33 +++++++------
 {core => scsys}/src/actors/actor.rs           |  0
 .../src/actors/apps/application.rs            |  0
 .../src/actors/apps/configs/configure.rs      |  0
 .../src/actors/apps/configs/mod.rs            |  1 -
 {core => scsys}/src/actors/apps/mod.rs        |  0
 .../src/actors/extract/extractor.rs           |  0
 .../src/actors/extract/files/agent.rs         |  0
 .../src/actors/extract/files/interface.rs     |  0
 .../src/actors/extract/files/mod.rs           |  0
 {core => scsys}/src/actors/extract/mod.rs     |  0
 .../src/actors/generate/alphabet.rs           |  3 +-
 {core => scsys}/src/actors/generate/digits.rs |  2 +-
 {core => scsys}/src/actors/generate/mod.rs    |  2 +-
 {core => scsys}/src/actors/handlers/files.rs  |  0
 {core => scsys}/src/actors/handlers/mod.rs    |  0
 {core => scsys}/src/actors/mod.rs             |  0
 {core => scsys}/src/actors/parse/basic.rs     |  0
 {core => scsys}/src/actors/parse/mod.rs       |  0
 .../src/components/accounts/account.rs        |  0
 .../src/components/accounts/mod.rs            |  0
 .../src/components/identities/appellation.rs  |  0
 .../src/components/identities/ids.rs          |  0
 .../src/components/identities/mod.rs          |  0
 .../src/components/logging/logger.rs          |  0
 {core => scsys}/src/components/logging/mod.rs |  0
 .../src/components/messages/message.rs        |  0
 .../src/components/messages/mod.rs            |  0
 {core => scsys}/src/components/mod.rs         |  0
 .../src/components/networking/mod.rs          |  0
 .../src/components/networking/proxy.rs        |  0
 .../src/components/networking/server.rs       |  0
 .../src/components/providers/mod.rs           |  0
 .../components/providers/networks/ethereum.rs |  0
 .../src/components/providers/networks/mod.rs  |  0
 .../src/components/providers/provider.rs      |  0
 .../src/components/providers/storage/cache.rs |  0
 .../components/providers/storage/database.rs  |  0
 .../src/components/providers/storage/mod.rs   |  0
 .../src/components/providers/storage/s3.rs    |  0
 {core => scsys}/src/data/caveats/caveat.rs    |  0
 {core => scsys}/src/data/caveats/mod.rs       |  0
 {core => scsys}/src/data/mod.rs               |  0
 {core => scsys}/src/data/models/events.rs     |  0
 {core => scsys}/src/data/models/mod.rs        |  0
 {core => scsys}/src/data/models/tokens.rs     |  0
 {core => scsys}/src/data/models/users.rs      |  0
 {core => scsys}/src/data/schemas/mod.rs       |  0
 {core => scsys}/src/data/schemas/tokens.rs    |  0
 {core => scsys}/src/data/schemas/users.rs     |  0
 {core => scsys}/src/data/structs/links.rs     |  0
 {core => scsys}/src/data/structs/mod.rs       |  0
 scsys/src/lib.rs                              | 28 ++---------
 scsys/tests/extract.rs                        |  2 +-
 scsys/tests/gen.rs                            |  5 +-
 74 files changed, 48 insertions(+), 152 deletions(-)
 delete mode 100644 .dockerignore
 delete mode 100644 Dockerfile
 rename core/src/{core => }/contexts/context.rs (100%)
 rename core/src/{core => }/contexts/mod.rs (100%)
 delete mode 100644 core/src/core/mod.rs
 rename core/src/{core => }/errors/error.rs (100%)
 rename core/src/{core => }/errors/mod.rs (100%)
 rename core/src/{core => }/events/event.rs (100%)
 rename core/src/{core => }/events/mod.rs (100%)
 rename core/src/{core => }/events/variants.rs (100%)
 create mode 100644 core/src/misc/mod.rs
 rename core/src/{core => misc}/primitives.rs (100%)
 rename core/src/{core => misc}/utils.rs (92%)
 rename core/src/{core => }/states/mod.rs (100%)
 rename core/src/{core => }/states/state.rs (100%)
 rename core/src/{core => }/times/mod.rs (100%)
 rename core/src/{core => }/times/timestamp.rs (100%)
 rename {core => scsys}/src/actors/actor.rs (100%)
 rename {core => scsys}/src/actors/apps/application.rs (100%)
 rename {core => scsys}/src/actors/apps/configs/configure.rs (100%)
 rename {core => scsys}/src/actors/apps/configs/mod.rs (99%)
 rename {core => scsys}/src/actors/apps/mod.rs (100%)
 rename {core => scsys}/src/actors/extract/extractor.rs (100%)
 rename {core => scsys}/src/actors/extract/files/agent.rs (100%)
 rename {core => scsys}/src/actors/extract/files/interface.rs (100%)
 rename {core => scsys}/src/actors/extract/files/mod.rs (100%)
 rename {core => scsys}/src/actors/extract/mod.rs (100%)
 rename {core => scsys}/src/actors/generate/alphabet.rs (90%)
 rename {core => scsys}/src/actors/generate/digits.rs (95%)
 rename {core => scsys}/src/actors/generate/mod.rs (93%)
 rename {core => scsys}/src/actors/handlers/files.rs (100%)
 rename {core => scsys}/src/actors/handlers/mod.rs (100%)
 rename {core => scsys}/src/actors/mod.rs (100%)
 rename {core => scsys}/src/actors/parse/basic.rs (100%)
 rename {core => scsys}/src/actors/parse/mod.rs (100%)
 rename {core => scsys}/src/components/accounts/account.rs (100%)
 rename {core => scsys}/src/components/accounts/mod.rs (100%)
 rename {core => scsys}/src/components/identities/appellation.rs (100%)
 rename {core => scsys}/src/components/identities/ids.rs (100%)
 rename {core => scsys}/src/components/identities/mod.rs (100%)
 rename {core => scsys}/src/components/logging/logger.rs (100%)
 rename {core => scsys}/src/components/logging/mod.rs (100%)
 rename {core => scsys}/src/components/messages/message.rs (100%)
 rename {core => scsys}/src/components/messages/mod.rs (100%)
 rename {core => scsys}/src/components/mod.rs (100%)
 rename {core => scsys}/src/components/networking/mod.rs (100%)
 rename {core => scsys}/src/components/networking/proxy.rs (100%)
 rename {core => scsys}/src/components/networking/server.rs (100%)
 rename {core => scsys}/src/components/providers/mod.rs (100%)
 rename {core => scsys}/src/components/providers/networks/ethereum.rs (100%)
 rename {core => scsys}/src/components/providers/networks/mod.rs (100%)
 rename {core => scsys}/src/components/providers/provider.rs (100%)
 rename {core => scsys}/src/components/providers/storage/cache.rs (100%)
 rename {core => scsys}/src/components/providers/storage/database.rs (100%)
 rename {core => scsys}/src/components/providers/storage/mod.rs (100%)
 rename {core => scsys}/src/components/providers/storage/s3.rs (100%)
 rename {core => scsys}/src/data/caveats/caveat.rs (100%)
 rename {core => scsys}/src/data/caveats/mod.rs (100%)
 rename {core => scsys}/src/data/mod.rs (100%)
 rename {core => scsys}/src/data/models/events.rs (100%)
 rename {core => scsys}/src/data/models/mod.rs (100%)
 rename {core => scsys}/src/data/models/tokens.rs (100%)
 rename {core => scsys}/src/data/models/users.rs (100%)
 rename {core => scsys}/src/data/schemas/mod.rs (100%)
 rename {core => scsys}/src/data/schemas/tokens.rs (100%)
 rename {core => scsys}/src/data/schemas/users.rs (100%)
 rename {core => scsys}/src/data/structs/links.rs (100%)
 rename {core => scsys}/src/data/structs/mod.rs (100%)

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 639562e6..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,48 +0,0 @@
-**/__pycache__/
-**/__sapper__/
-
-**/.DS_STORE/
-**/.artifacts/data/
-**/.cache/
-**/.docker/data/
-**/.idea/
-**/.pytest_cache/
-**/.svelte-kit/
-**/.vscode/
-
-**/artifacts/
-**/build/
-**/debug/
-**/dist/
-**/env/
-**/node_modules/
-**/target/
-**/venv/
-
-
-**/*.bk
-**/*.bk.*
-
-**/*.csv
-**/*.csv.*
-
-**/*.db
-**/*.db.*
-
-**/*.db-*.*
-
-**/*.lock
-**/*.lock.*
-
-**/*-lock.*
-
-**/*.log
-**/*.log.*
-
-**/*.whl
-**/*.whl.*
-
-**/*.zip
-**/*.zip.*
-
-
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 89e55f34..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM rust:latest as builder-base
-RUN apt-get update -y && apt-get upgrade -y
-
-RUN apt-get install -y \
-    protobuf-compiler
-
-RUN rustup update && \
-    rustup install nightly && \
-    rustup target add wasm32-unknown-unknown --toolchain nightly && \
-    rustup component add clippy rustfmt
-
-FROM builder-base as builder
-
-ADD . /project
-WORKDIR /project
-
-COPY . .
-
-RUN cargo build --release --workspace && \
-    cargo test --all --release -v
-
-# FROM builder as publisher
-
-# ENV CARGO_REGISTRY_TOKEN="" \
-#     PACKAGE=""
-
-# CMD [ "cargo", "publish", "-p",  ${PACKAGE}, "--token", ${CARGO_REGISTRY_TOKEN}]
\ No newline at end of file
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 80cc9ac2..98092a29 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -15,16 +15,7 @@ crate-type = ["cdylib", "rlib"]
 test = true
 
 [dependencies]
-anyhow = "1.0.65"
-bson = { features = ["chrono-0_4", "serde_with", "uuid-0_8"], version = "2.4.0" }
-chrono = "0.4.22"
-config = "0.13.2"
-futures = "0.3.24"
-glob = "0.3.0"
-hex = "0.4.3"
-log = "0.4.17"
-nom = "7.1.1"
-rand = { features = ["serde1"], version = "0.8.5" }
+
 ring = "0.16.20"
 serde = { features = ["derive"], version = "1.0.147" }
 serde_json = "1.0.87"
diff --git a/core/src/core/contexts/context.rs b/core/src/contexts/context.rs
similarity index 100%
rename from core/src/core/contexts/context.rs
rename to core/src/contexts/context.rs
diff --git a/core/src/core/contexts/mod.rs b/core/src/contexts/mod.rs
similarity index 100%
rename from core/src/core/contexts/mod.rs
rename to core/src/contexts/mod.rs
diff --git a/core/src/core/mod.rs b/core/src/core/mod.rs
deleted file mode 100644
index ab99a230..00000000
--- a/core/src/core/mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-    Appellation: core <module>
-    Creator: FL03 <jo3mccain@icloud.com>
-    Description: ... Summary ...
-*/
-#[doc(inline)]
-pub use self::{contexts::*, errors::*, events::*, primitives::*, times::*, utils::*};
-
-pub(crate) mod contexts;
-pub(crate) mod errors;
-pub(crate) mod events;
-mod primitives;
-pub mod states;
-pub(crate) mod times;
-mod utils;
diff --git a/core/src/core/errors/error.rs b/core/src/errors/error.rs
similarity index 100%
rename from core/src/core/errors/error.rs
rename to core/src/errors/error.rs
diff --git a/core/src/core/errors/mod.rs b/core/src/errors/mod.rs
similarity index 100%
rename from core/src/core/errors/mod.rs
rename to core/src/errors/mod.rs
diff --git a/core/src/core/events/event.rs b/core/src/events/event.rs
similarity index 100%
rename from core/src/core/events/event.rs
rename to core/src/events/event.rs
diff --git a/core/src/core/events/mod.rs b/core/src/events/mod.rs
similarity index 100%
rename from core/src/core/events/mod.rs
rename to core/src/events/mod.rs
diff --git a/core/src/core/events/variants.rs b/core/src/events/variants.rs
similarity index 100%
rename from core/src/core/events/variants.rs
rename to core/src/events/variants.rs
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 125a3b64..e702c264 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -6,9 +6,11 @@
 */
 #![allow(unused_imports)]
 #[doc(inline)]
-pub use self::core::*;
+pub use self::{misc::*, times::*};
 
-pub mod actors;
-pub mod components;
-pub(crate) mod core;
-pub mod data;
+pub mod contexts;
+pub mod errors;
+pub mod events;
+pub(crate) mod misc;
+pub mod states;
+pub(crate) mod times;
diff --git a/core/src/misc/mod.rs b/core/src/misc/mod.rs
new file mode 100644
index 00000000..1a22bee5
--- /dev/null
+++ b/core/src/misc/mod.rs
@@ -0,0 +1,10 @@
+/*
+    Appellation: core <module>
+    Creator: FL03 <jo3mccain@icloud.com>
+    Description: ... Summary ...
+*/
+#[doc(inline)]
+pub use self::{primitives::*, utils::*};
+
+pub(crate) mod primitives;
+pub(crate) mod utils;
diff --git a/core/src/core/primitives.rs b/core/src/misc/primitives.rs
similarity index 100%
rename from core/src/core/primitives.rs
rename to core/src/misc/primitives.rs
diff --git a/core/src/core/utils.rs b/core/src/misc/utils.rs
similarity index 92%
rename from core/src/core/utils.rs
rename to core/src/misc/utils.rs
index ab0051d5..217e30a0 100644
--- a/core/src/core/utils.rs
+++ b/core/src/misc/utils.rs
@@ -5,7 +5,6 @@
         ... Summary ...
 */
 pub use self::{configure::*, files::*};
-pub use crate::actors::{extract::utils::*, generate::utils::*, handlers::utils::*};
 pub use crate::times::utils::*;
 
 pub(crate) mod configure {
diff --git a/core/src/core/states/mod.rs b/core/src/states/mod.rs
similarity index 100%
rename from core/src/core/states/mod.rs
rename to core/src/states/mod.rs
diff --git a/core/src/core/states/state.rs b/core/src/states/state.rs
similarity index 100%
rename from core/src/core/states/state.rs
rename to core/src/states/state.rs
diff --git a/core/src/core/times/mod.rs b/core/src/times/mod.rs
similarity index 100%
rename from core/src/core/times/mod.rs
rename to core/src/times/mod.rs
diff --git a/core/src/core/times/timestamp.rs b/core/src/times/timestamp.rs
similarity index 100%
rename from core/src/core/times/timestamp.rs
rename to core/src/times/timestamp.rs
diff --git a/scsys/Cargo.toml b/scsys/Cargo.toml
index b4a8e64f..eef58e9f 100644
--- a/scsys/Cargo.toml
+++ b/scsys/Cargo.toml
@@ -15,30 +15,35 @@ version = "0.1.22" # TODO: Update the package version
 default = ["core", "crypto"]
 full = ["core", "crypto", "derive", "macros", "extras"]
 
-core = ["scsys-core"]
+core = ["scsys-core", "chrono", "config"]
 crypto = ["scsys-crypto"]
 derive = ["scsys-derive"]
 macros = ["scsys-macros"]
 
-extras = ["anyhow", "bson", "chrono", "config", "rand", "ring"]
-anyhow = ["anyhow/default"]
-bson = ["bson/default", "bson/chrono-0_4", "bson/serde_with", "bson/uuid-0_8"]
-chrono = ["chrono/default"]
-config = ["config/default"]
-rand = ["rand/default"]
-ring = ["ring/default"]
+extras = []
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 test = true
 
 [dependencies]
-anyhow = { optional = true, features = ["default"], version = "1.0.65" }
-bson = { features = ["chrono-0_4", "serde_with", "uuid-0_8"], optional = true, version = "2.4.0" }
-chrono = { optional = true, version = "0.4.22" }
-config = { optional = true, version = "0.13.2" }
-rand = { optional = true, version = "0.8.5" }
-ring = { optional = true, version = "0.16.20" }
+anyhow = "1.0.65"
+bson = { features = ["chrono-0_4", "serde_with", "uuid-0_8"], version = "2.4.0" }
+chrono = "0.4.22"
+config = "0.13.2"
+futures = "0.3.24"
+glob = "0.3.0"
+hex = "0.4.3"
+log = "0.4.17"
+nom = "7.1.1"
+rand = { features = ["getrandom", "serde1"], version = "0.8.5" }
+ring = "0.16.20"
+serde = { features = ["derive"], version = "1.0.147" }
+serde_json = "1.0.87"
+strum = { features = ["derive"], version = "0.24.1" }
+tracing = "0.1.36"
+tracing-subscriber = "0.3.15"
+url = "2.3.1"
 
 [dependencies.scsys-core]
 optional = true
diff --git a/core/src/actors/actor.rs b/scsys/src/actors/actor.rs
similarity index 100%
rename from core/src/actors/actor.rs
rename to scsys/src/actors/actor.rs
diff --git a/core/src/actors/apps/application.rs b/scsys/src/actors/apps/application.rs
similarity index 100%
rename from core/src/actors/apps/application.rs
rename to scsys/src/actors/apps/application.rs
diff --git a/core/src/actors/apps/configs/configure.rs b/scsys/src/actors/apps/configs/configure.rs
similarity index 100%
rename from core/src/actors/apps/configs/configure.rs
rename to scsys/src/actors/apps/configs/configure.rs
diff --git a/core/src/actors/apps/configs/mod.rs b/scsys/src/actors/apps/configs/mod.rs
similarity index 99%
rename from core/src/actors/apps/configs/mod.rs
rename to scsys/src/actors/apps/configs/mod.rs
index 5bf35410..70772a88 100644
--- a/core/src/actors/apps/configs/mod.rs
+++ b/scsys/src/actors/apps/configs/mod.rs
@@ -2,7 +2,6 @@
     Appellation: configurations <module>
     Contributors: FL03 <jo3mccain@icloud.com> (https://gitlab.com/FL03)
 */
-
 pub use self::configure::AppConfig;
 
 mod configure;
diff --git a/core/src/actors/apps/mod.rs b/scsys/src/actors/apps/mod.rs
similarity index 100%
rename from core/src/actors/apps/mod.rs
rename to scsys/src/actors/apps/mod.rs
diff --git a/core/src/actors/extract/extractor.rs b/scsys/src/actors/extract/extractor.rs
similarity index 100%
rename from core/src/actors/extract/extractor.rs
rename to scsys/src/actors/extract/extractor.rs
diff --git a/core/src/actors/extract/files/agent.rs b/scsys/src/actors/extract/files/agent.rs
similarity index 100%
rename from core/src/actors/extract/files/agent.rs
rename to scsys/src/actors/extract/files/agent.rs
diff --git a/core/src/actors/extract/files/interface.rs b/scsys/src/actors/extract/files/interface.rs
similarity index 100%
rename from core/src/actors/extract/files/interface.rs
rename to scsys/src/actors/extract/files/interface.rs
diff --git a/core/src/actors/extract/files/mod.rs b/scsys/src/actors/extract/files/mod.rs
similarity index 100%
rename from core/src/actors/extract/files/mod.rs
rename to scsys/src/actors/extract/files/mod.rs
diff --git a/core/src/actors/extract/mod.rs b/scsys/src/actors/extract/mod.rs
similarity index 100%
rename from core/src/actors/extract/mod.rs
rename to scsys/src/actors/extract/mod.rs
diff --git a/core/src/actors/generate/alphabet.rs b/scsys/src/actors/generate/alphabet.rs
similarity index 90%
rename from core/src/actors/generate/alphabet.rs
rename to scsys/src/actors/generate/alphabet.rs
index 805977cc..93aac274 100644
--- a/core/src/actors/generate/alphabet.rs
+++ b/scsys/src/actors/generate/alphabet.rs
@@ -4,7 +4,8 @@
     Description:
         ... Summary ...
 */
-use crate::{generate_random_string, Timestamp};
+use crate::core::Timestamp;
+use super::generate_random_string;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
diff --git a/core/src/actors/generate/digits.rs b/scsys/src/actors/generate/digits.rs
similarity index 95%
rename from core/src/actors/generate/digits.rs
rename to scsys/src/actors/generate/digits.rs
index c4d9735f..b882a4bb 100644
--- a/core/src/actors/generate/digits.rs
+++ b/scsys/src/actors/generate/digits.rs
@@ -4,7 +4,7 @@
     Description:
         ... Summary ...
 */
-use crate::generate_random_number;
+use super::generate_random_number;
 use rand::{distributions, prelude::Distribution};
 use serde::{Deserialize, Serialize};
 
diff --git a/core/src/actors/generate/mod.rs b/scsys/src/actors/generate/mod.rs
similarity index 93%
rename from core/src/actors/generate/mod.rs
rename to scsys/src/actors/generate/mod.rs
index 9924f873..184d11b3 100644
--- a/core/src/actors/generate/mod.rs
+++ b/scsys/src/actors/generate/mod.rs
@@ -4,7 +4,7 @@
     Description:
         ... Summary ...
 */
-pub use self::{alphabet::*, digits::*};
+pub use self::{alphabet::*, digits::*, utils::*};
 
 mod alphabet;
 mod digits;
diff --git a/core/src/actors/handlers/files.rs b/scsys/src/actors/handlers/files.rs
similarity index 100%
rename from core/src/actors/handlers/files.rs
rename to scsys/src/actors/handlers/files.rs
diff --git a/core/src/actors/handlers/mod.rs b/scsys/src/actors/handlers/mod.rs
similarity index 100%
rename from core/src/actors/handlers/mod.rs
rename to scsys/src/actors/handlers/mod.rs
diff --git a/core/src/actors/mod.rs b/scsys/src/actors/mod.rs
similarity index 100%
rename from core/src/actors/mod.rs
rename to scsys/src/actors/mod.rs
diff --git a/core/src/actors/parse/basic.rs b/scsys/src/actors/parse/basic.rs
similarity index 100%
rename from core/src/actors/parse/basic.rs
rename to scsys/src/actors/parse/basic.rs
diff --git a/core/src/actors/parse/mod.rs b/scsys/src/actors/parse/mod.rs
similarity index 100%
rename from core/src/actors/parse/mod.rs
rename to scsys/src/actors/parse/mod.rs
diff --git a/core/src/components/accounts/account.rs b/scsys/src/components/accounts/account.rs
similarity index 100%
rename from core/src/components/accounts/account.rs
rename to scsys/src/components/accounts/account.rs
diff --git a/core/src/components/accounts/mod.rs b/scsys/src/components/accounts/mod.rs
similarity index 100%
rename from core/src/components/accounts/mod.rs
rename to scsys/src/components/accounts/mod.rs
diff --git a/core/src/components/identities/appellation.rs b/scsys/src/components/identities/appellation.rs
similarity index 100%
rename from core/src/components/identities/appellation.rs
rename to scsys/src/components/identities/appellation.rs
diff --git a/core/src/components/identities/ids.rs b/scsys/src/components/identities/ids.rs
similarity index 100%
rename from core/src/components/identities/ids.rs
rename to scsys/src/components/identities/ids.rs
diff --git a/core/src/components/identities/mod.rs b/scsys/src/components/identities/mod.rs
similarity index 100%
rename from core/src/components/identities/mod.rs
rename to scsys/src/components/identities/mod.rs
diff --git a/core/src/components/logging/logger.rs b/scsys/src/components/logging/logger.rs
similarity index 100%
rename from core/src/components/logging/logger.rs
rename to scsys/src/components/logging/logger.rs
diff --git a/core/src/components/logging/mod.rs b/scsys/src/components/logging/mod.rs
similarity index 100%
rename from core/src/components/logging/mod.rs
rename to scsys/src/components/logging/mod.rs
diff --git a/core/src/components/messages/message.rs b/scsys/src/components/messages/message.rs
similarity index 100%
rename from core/src/components/messages/message.rs
rename to scsys/src/components/messages/message.rs
diff --git a/core/src/components/messages/mod.rs b/scsys/src/components/messages/mod.rs
similarity index 100%
rename from core/src/components/messages/mod.rs
rename to scsys/src/components/messages/mod.rs
diff --git a/core/src/components/mod.rs b/scsys/src/components/mod.rs
similarity index 100%
rename from core/src/components/mod.rs
rename to scsys/src/components/mod.rs
diff --git a/core/src/components/networking/mod.rs b/scsys/src/components/networking/mod.rs
similarity index 100%
rename from core/src/components/networking/mod.rs
rename to scsys/src/components/networking/mod.rs
diff --git a/core/src/components/networking/proxy.rs b/scsys/src/components/networking/proxy.rs
similarity index 100%
rename from core/src/components/networking/proxy.rs
rename to scsys/src/components/networking/proxy.rs
diff --git a/core/src/components/networking/server.rs b/scsys/src/components/networking/server.rs
similarity index 100%
rename from core/src/components/networking/server.rs
rename to scsys/src/components/networking/server.rs
diff --git a/core/src/components/providers/mod.rs b/scsys/src/components/providers/mod.rs
similarity index 100%
rename from core/src/components/providers/mod.rs
rename to scsys/src/components/providers/mod.rs
diff --git a/core/src/components/providers/networks/ethereum.rs b/scsys/src/components/providers/networks/ethereum.rs
similarity index 100%
rename from core/src/components/providers/networks/ethereum.rs
rename to scsys/src/components/providers/networks/ethereum.rs
diff --git a/core/src/components/providers/networks/mod.rs b/scsys/src/components/providers/networks/mod.rs
similarity index 100%
rename from core/src/components/providers/networks/mod.rs
rename to scsys/src/components/providers/networks/mod.rs
diff --git a/core/src/components/providers/provider.rs b/scsys/src/components/providers/provider.rs
similarity index 100%
rename from core/src/components/providers/provider.rs
rename to scsys/src/components/providers/provider.rs
diff --git a/core/src/components/providers/storage/cache.rs b/scsys/src/components/providers/storage/cache.rs
similarity index 100%
rename from core/src/components/providers/storage/cache.rs
rename to scsys/src/components/providers/storage/cache.rs
diff --git a/core/src/components/providers/storage/database.rs b/scsys/src/components/providers/storage/database.rs
similarity index 100%
rename from core/src/components/providers/storage/database.rs
rename to scsys/src/components/providers/storage/database.rs
diff --git a/core/src/components/providers/storage/mod.rs b/scsys/src/components/providers/storage/mod.rs
similarity index 100%
rename from core/src/components/providers/storage/mod.rs
rename to scsys/src/components/providers/storage/mod.rs
diff --git a/core/src/components/providers/storage/s3.rs b/scsys/src/components/providers/storage/s3.rs
similarity index 100%
rename from core/src/components/providers/storage/s3.rs
rename to scsys/src/components/providers/storage/s3.rs
diff --git a/core/src/data/caveats/caveat.rs b/scsys/src/data/caveats/caveat.rs
similarity index 100%
rename from core/src/data/caveats/caveat.rs
rename to scsys/src/data/caveats/caveat.rs
diff --git a/core/src/data/caveats/mod.rs b/scsys/src/data/caveats/mod.rs
similarity index 100%
rename from core/src/data/caveats/mod.rs
rename to scsys/src/data/caveats/mod.rs
diff --git a/core/src/data/mod.rs b/scsys/src/data/mod.rs
similarity index 100%
rename from core/src/data/mod.rs
rename to scsys/src/data/mod.rs
diff --git a/core/src/data/models/events.rs b/scsys/src/data/models/events.rs
similarity index 100%
rename from core/src/data/models/events.rs
rename to scsys/src/data/models/events.rs
diff --git a/core/src/data/models/mod.rs b/scsys/src/data/models/mod.rs
similarity index 100%
rename from core/src/data/models/mod.rs
rename to scsys/src/data/models/mod.rs
diff --git a/core/src/data/models/tokens.rs b/scsys/src/data/models/tokens.rs
similarity index 100%
rename from core/src/data/models/tokens.rs
rename to scsys/src/data/models/tokens.rs
diff --git a/core/src/data/models/users.rs b/scsys/src/data/models/users.rs
similarity index 100%
rename from core/src/data/models/users.rs
rename to scsys/src/data/models/users.rs
diff --git a/core/src/data/schemas/mod.rs b/scsys/src/data/schemas/mod.rs
similarity index 100%
rename from core/src/data/schemas/mod.rs
rename to scsys/src/data/schemas/mod.rs
diff --git a/core/src/data/schemas/tokens.rs b/scsys/src/data/schemas/tokens.rs
similarity index 100%
rename from core/src/data/schemas/tokens.rs
rename to scsys/src/data/schemas/tokens.rs
diff --git a/core/src/data/schemas/users.rs b/scsys/src/data/schemas/users.rs
similarity index 100%
rename from core/src/data/schemas/users.rs
rename to scsys/src/data/schemas/users.rs
diff --git a/core/src/data/structs/links.rs b/scsys/src/data/structs/links.rs
similarity index 100%
rename from core/src/data/structs/links.rs
rename to scsys/src/data/structs/links.rs
diff --git a/core/src/data/structs/mod.rs b/scsys/src/data/structs/mod.rs
similarity index 100%
rename from core/src/data/structs/mod.rs
rename to scsys/src/data/structs/mod.rs
diff --git a/scsys/src/lib.rs b/scsys/src/lib.rs
index 5d617e3b..2102f5c1 100644
--- a/scsys/src/lib.rs
+++ b/scsys/src/lib.rs
@@ -4,11 +4,13 @@
     Description:
         ... Summary ...
 */
-#![allow(unused_imports)]
+pub mod actors;
+pub mod components;
+pub mod data;
 
 #[doc(inline)]
 #[cfg(feature = "core")]
-pub use scsys_core::*;
+pub use scsys_core as core;
 #[cfg(feature = "crypto")]
 pub use scsys_crypto as crypto;
 #[cfg(feature = "derive")]
@@ -17,28 +19,8 @@ pub use scsys_derive::*;
 pub use scsys_macros::*;
 
 pub mod prelude {
-    #[cfg(feature = "anyhow")]
-    pub use anyhow;
-    #[cfg(feature = "bson")]
-    pub use bson;
-    #[cfg(feature = "chrono")]
-    pub use chrono;
-    #[cfg(feature = "config")]
-    pub use config;
-    #[cfg(feature = "rand")]
-    pub use rand;
-    #[cfg(feature = "ring")]
-    pub use ring;
-
     #[cfg(feature = "core")]
-    pub use super::{
-        actors::{extract::*, generate::*, handlers::*, parse::*},
-        components::{
-            accounts::*, identities::*, logging::*, messages::*, networking::*, providers::*,
-        },
-        data::{caveats::*, models::*, schemas::*},
-        states::*,
-    };
+    pub use super::core::*;
 
     #[cfg(feature = "crypto")]
     pub use super::crypto::{self, hash::*};
diff --git a/scsys/tests/extract.rs b/scsys/tests/extract.rs
index f4d6e1de..f4b82fc9 100644
--- a/scsys/tests/extract.rs
+++ b/scsys/tests/extract.rs
@@ -1,6 +1,6 @@
 #[cfg(test)]
 mod tests {
-    use scsys::prelude::{Extractor, FileExtractor, FileInterface};
+    use scsys::actors::extract::{Extractor, FileExtractor, FileInterface};
 
     #[test]
     fn test_file_extractor() {
diff --git a/scsys/tests/gen.rs b/scsys/tests/gen.rs
index c64ee51b..f17566b1 100644
--- a/scsys/tests/gen.rs
+++ b/scsys/tests/gen.rs
@@ -1,9 +1,6 @@
 #[cfg(test)]
 mod tests {
-    use scsys::{
-        generate_random_number,
-        prelude::{DigitGenerator, StringGenerator},
-    };
+    use scsys::actors::generate::{DigitGenerator, StringGenerator, generate_random_number};
 
     #[test]
     fn test_generate_number_default() {

From 11554b6589ae905b87d3bb5b68bba5500536f2aa Mon Sep 17 00:00:00 2001
From: Joe McCain III <jo3mccain@icloud.com>
Date: Sat, 29 Oct 2022 00:14:45 +0000
Subject: [PATCH 2/4] Update

---
 core/Cargo.toml                                |  5 ++++-
 core/src/events/event.rs                       |  3 ++-
 core/src/events/mod.rs                         |  5 +++--
 .../events.rs => core/src/events/payload.rs    |  7 ++++---
 scsys/Cargo.toml                               |  2 +-
 scsys/src/data/models/mod.rs                   |  7 +++----
 scsys/src/data/models/tokens.rs                |  4 +++-
 scsys/src/data/models/users.rs                 |  9 +++++----
 scsys/src/lib.rs                               | 18 ++++++++++++++++--
 9 files changed, 41 insertions(+), 19 deletions(-)
 rename scsys/src/data/models/events.rs => core/src/events/payload.rs (77%)

diff --git a/core/Cargo.toml b/core/Cargo.toml
index 98092a29..69c0026d 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -15,7 +15,10 @@ crate-type = ["cdylib", "rlib"]
 test = true
 
 [dependencies]
-
+bson = { features = ["chrono-0_4", "serde_with", "uuid-0_8"], version = "2.4.0" }
+chrono = "0.4.22"
+config = "0.13.2"
+glob = "0.3.0"
 ring = "0.16.20"
 serde = { features = ["derive"], version = "1.0.147" }
 serde_json = "1.0.87"
diff --git a/core/src/events/event.rs b/core/src/events/event.rs
index ff80dc31..9e2ab2f8 100644
--- a/core/src/events/event.rs
+++ b/core/src/events/event.rs
@@ -4,7 +4,8 @@
     Description:
         ... Summary ...
 */
-use crate::{data::models::EventModel, BsonOid, Timestamp};
+use crate::{BsonOid, Timestamp};
+use super::payload::EventModel;
 use serde::{Deserialize, Serialize};
 
 pub trait EventSpec {
diff --git a/core/src/events/mod.rs b/core/src/events/mod.rs
index c50e49a5..6c9e2476 100644
--- a/core/src/events/mod.rs
+++ b/core/src/events/mod.rs
@@ -4,10 +4,11 @@
     Description:
         ... Summary ...
 */
-pub use self::{event::*, variants::*};
+pub use self::{event::*, payload::*, variants::*};
 
 pub(crate) mod event;
-mod variants;
+pub(crate) mod payload;
+pub(crate) mod variants;
 
 #[cfg(test)]
 mod tests {
diff --git a/scsys/src/data/models/events.rs b/core/src/events/payload.rs
similarity index 77%
rename from scsys/src/data/models/events.rs
rename to core/src/events/payload.rs
index 5e95a254..638278e1 100644
--- a/scsys/src/data/models/events.rs
+++ b/core/src/events/payload.rs
@@ -1,15 +1,16 @@
 /*
-    Appellation: events <module>
+    Appellation: payload <events>
     Contributors: FL03 <jo3mccain@icloud.com> (https://gitlab.com/FL03)
     Description:
         ... Summary ...
 */
-use crate::{BsonOid, Timestamp};
+use crate::Timestamp;
+use bson::oid::ObjectId;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub struct EventModel {
-    pub id: BsonOid,
+    pub id: ObjectId,
     pub created: Timestamp,
     pub dispersed: Timestamp,
     pub data: Vec<String>,
diff --git a/scsys/Cargo.toml b/scsys/Cargo.toml
index eef58e9f..94f3bed8 100644
--- a/scsys/Cargo.toml
+++ b/scsys/Cargo.toml
@@ -15,7 +15,7 @@ version = "0.1.22" # TODO: Update the package version
 default = ["core", "crypto"]
 full = ["core", "crypto", "derive", "macros", "extras"]
 
-core = ["scsys-core", "chrono", "config"]
+core = ["scsys-core"]
 crypto = ["scsys-crypto"]
 derive = ["scsys-derive"]
 macros = ["scsys-macros"]
diff --git a/scsys/src/data/models/mod.rs b/scsys/src/data/models/mod.rs
index 8cef0c46..752e7fe3 100644
--- a/scsys/src/data/models/mod.rs
+++ b/scsys/src/data/models/mod.rs
@@ -4,8 +4,7 @@
     Description:
         ... Summary ...
 */
-pub use self::{events::*, tokens::*, users::*};
+pub use self::{tokens::*, users::*};
 
-pub(crate) mod events;
-mod tokens;
-mod users;
+pub(crate) mod tokens;
+pub(crate) mod users;
diff --git a/scsys/src/data/models/tokens.rs b/scsys/src/data/models/tokens.rs
index 94cf35f0..3cc06f79 100644
--- a/scsys/src/data/models/tokens.rs
+++ b/scsys/src/data/models/tokens.rs
@@ -4,8 +4,10 @@
     Description:
         ... Summary ...
 */
+use bson::oid::ObjectId;
+use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Eq, Hash, PartialEq, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub struct Tokens {
     pub access_token: String,
     pub token_type: String,
diff --git a/scsys/src/data/models/users.rs b/scsys/src/data/models/users.rs
index eca029a6..ae6c0762 100644
--- a/scsys/src/data/models/users.rs
+++ b/scsys/src/data/models/users.rs
@@ -4,19 +4,20 @@
     Description:
         ... Summary ...
 */
-use crate::BsonOid;
+use bson::oid::ObjectId;
+use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, Eq, Hash, PartialEq, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub struct Users {
     #[serde(rename = "_id", skip_serializing_if = "Option::is_none")]
-    pub id: Option<BsonOid>,
+    pub id: Option<ObjectId>,
 
     pub username: String,
 }
 
 impl Users {
     pub fn new(username: String) -> Self {
-        let id = Some(BsonOid::new());
+        let id = Some(ObjectId::new());
 
         Self { id, username }
     }
diff --git a/scsys/src/lib.rs b/scsys/src/lib.rs
index 2102f5c1..aef0fcd3 100644
--- a/scsys/src/lib.rs
+++ b/scsys/src/lib.rs
@@ -19,9 +19,23 @@ pub use scsys_derive::*;
 pub use scsys_macros::*;
 
 pub mod prelude {
+    #[doc(inline)]
+    pub use bson;
+    #[doc(inline)]
+    pub use chrono;
+    #[doc(inline)]
+    pub use config;
+    #[doc(inline)]
+    pub use log;
+    #[doc(inline)]
+    pub use rand;
+    #[doc(inline)]
+    pub use ring;
+
+
     #[cfg(feature = "core")]
-    pub use super::core::*;
+    pub use super::core::{self, contexts::*, errors::*, events::*, states::*};
 
     #[cfg(feature = "crypto")]
-    pub use super::crypto::{self, hash::*};
+    pub use super::crypto::{self, hash::*, keys::*};
 }

From 7dfce373d6987dad3176748340520ecae51e41f6 Mon Sep 17 00:00:00 2001
From: Joe McCain III <jo3mccain@icloud.com>
Date: Sat, 29 Oct 2022 00:21:05 +0000
Subject: [PATCH 3/4] Update

---
 crypto/Cargo.toml                            | 2 +-
 scsys/src/actors/actor.rs                    | 4 ++--
 scsys/src/actors/apps/configs/configure.rs   | 2 +-
 scsys/src/actors/handlers/files.rs           | 9 ++-------
 scsys/src/components/identities/ids.rs       | 2 +-
 scsys/src/components/identities/mod.rs       | 2 +-
 scsys/src/components/messages/message.rs     | 2 +-
 scsys/src/components/providers/storage/s3.rs | 5 +++--
 scsys/src/data/structs/links.rs              | 8 ++++----
 9 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/crypto/Cargo.toml b/crypto/Cargo.toml
index 9b406f2e..4d4977a0 100644
--- a/crypto/Cargo.toml
+++ b/crypto/Cargo.toml
@@ -21,7 +21,7 @@ itertools = "0.10.5"
 rand = "0.8.5"
 ring = "0.16.20"
 serde = { features = ["derive"], version = "1.0.147" }
-serde_json = "1.0.87" 
+serde_json = "1.0.87"
 sha2 = "0.10.6"
 typenum = "1.15.0"
 
diff --git a/scsys/src/actors/actor.rs b/scsys/src/actors/actor.rs
index c9771389..0a36c620 100644
--- a/scsys/src/actors/actor.rs
+++ b/scsys/src/actors/actor.rs
@@ -4,11 +4,11 @@
     Description:
         ... Summary ...
 */
-use crate::components::identities::Appellation;
+use crate::{components::identities::Appellation, core::BoxResult};
 
 pub trait Transformation<S> {
     fn data(&self) -> Vec<S>;
-    fn transform<T>(&self, catalyst: fn(&S) -> T) -> crate::BoxResult<Vec<T>> {
+    fn transform<T>(&self, catalyst: fn(&S) -> T) -> BoxResult<Vec<T>> {
         let res = self.data().iter().map(|i| catalyst(i)).collect::<Vec<_>>();
         Ok(res)
     }
diff --git a/scsys/src/actors/apps/configs/configure.rs b/scsys/src/actors/apps/configs/configure.rs
index 68cd72c9..2358d6c4 100644
--- a/scsys/src/actors/apps/configs/configure.rs
+++ b/scsys/src/actors/apps/configs/configure.rs
@@ -2,7 +2,7 @@
     Appellation: configuration <module>
     Contributors: FL03 <jo3mccain@icloud.com> (https://gitlab.com/FL03)
 */
-use crate::{collect_config_files, DefaultConfigBuilder};
+use crate::core::{collect_config_files, DefaultConfigBuilder};
 
 use config::{Config, ConfigError};
 
diff --git a/scsys/src/actors/handlers/files.rs b/scsys/src/actors/handlers/files.rs
index abbb3f98..69b33ecd 100644
--- a/scsys/src/actors/handlers/files.rs
+++ b/scsys/src/actors/handlers/files.rs
@@ -4,6 +4,7 @@
     Description:
         ... Summary ...
 */
+use crate::core::BoxResult;
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq, serde::Deserialize, serde::Serialize)]
 pub struct FileHandler {
@@ -11,14 +12,8 @@ pub struct FileHandler {
 }
 
 impl FileHandler {
-    fn constructor(path: String) -> Result<Self, crate::BoxError> {
-        Ok(Self { path })
-    }
     pub fn new(path: String) -> Self {
-        match Self::constructor(path) {
-            Ok(v) => v,
-            Err(e) => panic!("FileHandler Error: {}", e),
-        }
+       Self { path }
     }
 }
 
diff --git a/scsys/src/components/identities/ids.rs b/scsys/src/components/identities/ids.rs
index 8c359d0c..a5a6c750 100644
--- a/scsys/src/components/identities/ids.rs
+++ b/scsys/src/components/identities/ids.rs
@@ -4,7 +4,7 @@
     Description:
         ... Summary ...
 */
-use crate::BsonOid;
+use crate::core::BsonOid;
 use serde::{Deserialize, Serialize};
 use strum::{EnumString, EnumVariantNames};
 
diff --git a/scsys/src/components/identities/mod.rs b/scsys/src/components/identities/mod.rs
index bd2fa83c..74ac8be0 100644
--- a/scsys/src/components/identities/mod.rs
+++ b/scsys/src/components/identities/mod.rs
@@ -10,7 +10,7 @@ pub(crate) mod ids;
 
 pub(crate) mod interface {
     use super::Id;
-    use crate::times::Timestamp;
+    use crate::core::Timestamp;
     use serde_json::Value;
 
     pub trait Identitfiable {
diff --git a/scsys/src/components/messages/message.rs b/scsys/src/components/messages/message.rs
index 023ac9d8..956d1a70 100644
--- a/scsys/src/components/messages/message.rs
+++ b/scsys/src/components/messages/message.rs
@@ -4,7 +4,7 @@
     Description:
         ... Summary ...
 */
-use crate::Timestamp;
+use crate::core::Timestamp;
 use bson::oid::ObjectId;
 use serde::{Deserialize, Serialize};
 
diff --git a/scsys/src/components/providers/storage/s3.rs b/scsys/src/components/providers/storage/s3.rs
index c8f8e026..0ddb5dc0 100644
--- a/scsys/src/components/providers/storage/s3.rs
+++ b/scsys/src/components/providers/storage/s3.rs
@@ -4,6 +4,7 @@
     Description:
         ... Summary ...
 */
+use crate::core::Result;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize)]
@@ -22,7 +23,7 @@ impl S3Credential {
     pub fn from_env(
         access: Option<&str>,
         secret: Option<&str>,
-    ) -> crate::Result<Self, std::env::VarError> {
+    ) -> Result<Self, std::env::VarError> {
         let access = match access {
             Some(v) => std::env::var(v),
             None => std::env::var("S3_ACCESS_KEY"),
@@ -54,7 +55,7 @@ impl S3Region {
     pub fn from_env(
         endpoint: Option<&str>,
         region: Option<&str>,
-    ) -> crate::Result<Self, std::env::VarError> {
+    ) -> Result<Self, std::env::VarError> {
         let endpoint = match endpoint {
             Some(v) => std::env::var(v),
             None => std::env::var("S3_ENDPOINT"),
diff --git a/scsys/src/data/structs/links.rs b/scsys/src/data/structs/links.rs
index 18f5bc27..71b9e7d0 100644
--- a/scsys/src/data/structs/links.rs
+++ b/scsys/src/data/structs/links.rs
@@ -3,7 +3,7 @@
     Creator: FL03 <jo3mccain@icloud.com>
     Description:
 */
-
+use crate::core::Result;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -17,8 +17,8 @@ impl Uri {
     pub fn new(data: String) -> Self {
         Self(data)
     }
-    pub fn parse(&self) -> crate::Result<Url> {
-        let data = url::Url::parse(self.0.as_str())?;
-        Ok(url::Url::parse(self.0.as_str())?)
+    pub fn parse(&self) -> Result<Url> {
+        let url = Url::parse(self.0.as_str())?;
+        Ok(url)
     }
 }

From 83b49be98d9ea15482115a5e1558a2a2e3e735b7 Mon Sep 17 00:00:00 2001
From: Joe McCain III <jo3mccain@icloud.com>
Date: Sat, 29 Oct 2022 00:23:23 +0000
Subject: [PATCH 4/4] Update

---
 core/src/events/event.rs              | 2 +-
 core/src/times/timestamp.rs           | 2 +-
 scsys/src/actors/generate/alphabet.rs | 2 +-
 scsys/src/actors/handlers/files.rs    | 2 +-
 scsys/src/lib.rs                      | 1 -
 scsys/tests/gen.rs                    | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/events/event.rs b/core/src/events/event.rs
index 9e2ab2f8..1409735f 100644
--- a/core/src/events/event.rs
+++ b/core/src/events/event.rs
@@ -4,8 +4,8 @@
     Description:
         ... Summary ...
 */
-use crate::{BsonOid, Timestamp};
 use super::payload::EventModel;
+use crate::{BsonOid, Timestamp};
 use serde::{Deserialize, Serialize};
 
 pub trait EventSpec {
diff --git a/core/src/times/timestamp.rs b/core/src/times/timestamp.rs
index 3bc74c10..0e5eb3e4 100644
--- a/core/src/times/timestamp.rs
+++ b/core/src/times/timestamp.rs
@@ -4,7 +4,7 @@
     Description:
         ... Summary ...
 */
-use crate::{ChronoDateTime, chrono_datetime_now, chrono_into_bson};
+use crate::{chrono_datetime_now, chrono_into_bson, ChronoDateTime};
 use chrono::Utc;
 use serde::{Deserialize, Serialize};
 
diff --git a/scsys/src/actors/generate/alphabet.rs b/scsys/src/actors/generate/alphabet.rs
index 93aac274..f16a18a8 100644
--- a/scsys/src/actors/generate/alphabet.rs
+++ b/scsys/src/actors/generate/alphabet.rs
@@ -4,8 +4,8 @@
     Description:
         ... Summary ...
 */
-use crate::core::Timestamp;
 use super::generate_random_string;
+use crate::core::Timestamp;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
diff --git a/scsys/src/actors/handlers/files.rs b/scsys/src/actors/handlers/files.rs
index 69b33ecd..12ce57c9 100644
--- a/scsys/src/actors/handlers/files.rs
+++ b/scsys/src/actors/handlers/files.rs
@@ -13,7 +13,7 @@ pub struct FileHandler {
 
 impl FileHandler {
     pub fn new(path: String) -> Self {
-       Self { path }
+        Self { path }
     }
 }
 
diff --git a/scsys/src/lib.rs b/scsys/src/lib.rs
index aef0fcd3..d9f36bb9 100644
--- a/scsys/src/lib.rs
+++ b/scsys/src/lib.rs
@@ -32,7 +32,6 @@ pub mod prelude {
     #[doc(inline)]
     pub use ring;
 
-
     #[cfg(feature = "core")]
     pub use super::core::{self, contexts::*, errors::*, events::*, states::*};
 
diff --git a/scsys/tests/gen.rs b/scsys/tests/gen.rs
index f17566b1..99ba88f6 100644
--- a/scsys/tests/gen.rs
+++ b/scsys/tests/gen.rs
@@ -1,6 +1,6 @@
 #[cfg(test)]
 mod tests {
-    use scsys::actors::generate::{DigitGenerator, StringGenerator, generate_random_number};
+    use scsys::actors::generate::{generate_random_number, DigitGenerator, StringGenerator};
 
     #[test]
     fn test_generate_number_default() {