Restructured packages

src/tests.rs

@@ -1,5 +1,6 @@
 // Many of these have been borrowed from insect.
 use crate::parser;
+use crate::evaluate::evaluate;
 
 fn eval_to_str(s: &str) -> Result<String, ()> {
 	let g = match parser::parse(&String::from(s)) {
@@ -8,7 +9,7 @@ fn eval_to_str(s: &str) -> Result<String, ()> {
 	};
 	//let out_str = g.print();
 
-	return match g.evaluate() {
+	return match evaluate(&g) {
 		Ok(x) => Ok(x.to_string_outer()),
 		Err(_) => Err(())
 	};