more consistent imports

1 files changed, 8 insertions, 6 deletions

diff --git a/src/assemblage.rs b/src/assemblage.rs
index bdd6c25..71142f1 100644
--- a/src/assemblage.rs
+++ b/src/assemblage.rs
@@ -1,12 +1,14 @@
 
 use std::collections::HashMap;
 use serde_json::{Value, json};
-use super::componentparameter::ComponentParameter;
-use super::parameter::{Parameter, ParameterType};
-use super::componentwrapper::{ComponentWrapper, ComponentType};
-use super::components::Serialise;
-use crate::hashmap;
-use crate::template::Template;
+use crate::{
+	componentparameter::ComponentParameter,
+	parameter::{Parameter, ParameterType},
+	componentwrapper::{ComponentWrapper, ComponentType},
+	components::Serialise,
+	hashmap,
+	Template
+};
 
 type ArgumentDef = (String, ParameterType, Option<Parameter>);