pub mod lex_script_tool;
pub mod tool;

use self::lex_script_tool::*;
use silkthread_base::*;
use silkthread_base::basic::*;

///
/// ToolSet for dealing with the scripting language
///
pub struct ScriptTools {
}

impl ToolSet for ScriptTools{
    fn create_tools(self, _: &Environment) -> Vec<(String, Box<Tool>)> {
        vec![
            (String::from(tool::LEX_SCRIPT), Box::new(create_lex_script_tool()))
        ]
    }
}

impl ScriptTools {
    ///
    /// Creates a new script toolset
    ///
    pub fn new() -> ScriptTools {
        ScriptTools { }
    }
}

pub mod lex_script_tool;
pub mod tool;

use self::lex_script_tool::*;
use silkthread_base::*;
use silkthread_base::basic::*;

///
/// ToolSet for dealing with the scripting language
///
pub struct ScriptToolSet {
}

impl ToolSet for ScriptToolSet {
    fn create_tools(self, _: &Environment) -> Vec<(String, Box<Tool>)> {
        vec![
            (String::from(tool::LEX_SCRIPT), Box::new(create_lex_script_tool()))
        ]
    }
}

impl ScriptToolSet {
    ///
    /// Creates a new script toolset
    ///
    pub fn new() -> ScriptToolSet {
        ScriptToolSet { }
    }
}

--- 
+++ 
@@ -8,10 +8,10 @@
 ///
 /// ToolSet for dealing with the scripting language
 ///
-pub struct ScriptTools {
+pub struct ScriptToolSet {
 }
 
-impl ToolSet for ScriptTools{
+impl ToolSet for ScriptToolSet {
     fn create_tools(self, _: &Environment) -> Vec<(String, Box<Tool>)> {
         vec![
             (String::from(tool::LEX_SCRIPT), Box::new(create_lex_script_tool()))
@@ -19,11 +19,11 @@
     }
 }
 
-impl ScriptTools {
+impl ScriptToolSet {
     ///
     /// Creates a new script toolset
     ///
-    pub fn new() -> ScriptTools {
-        ScriptTools { }
+    pub fn new() -> ScriptToolSet {
+        ScriptToolSet { }
     }
 }
Rename to ScriptTools for consistency with the toolkit library
