diff --git a/ScriptUI Panels/yToolBox.jsx b/ScriptUI Panels/yToolBox.jsx
index 31a75e6..e2afb77 100644
--- a/ScriptUI Panels/yToolBox.jsx	
+++ b/ScriptUI Panels/yToolBox.jsx	
@@ -1 +1 @@
-var scriptUIPanel = this;
YTB =
{   
    info :
    {
        name : "yToolBox",
        ver : 0.5,
        status : "alpha",
        url : "yorchnet.com",
        description : "My mixed bag of tools"
    },
    resources :
    {
        icon : new File('../yScripts/yNet.png'),
        header :  new File('../yScripts/header.png')
    },
    appearence :
    {
      buttonHeight : 30,
      buttonWidth : 126  
    },
    tools : [],
    createUI : function createUI()
    {
        var res ="group\
        {\
        orientation:'column',\
        alignment:['fill','fill'],\
        margins:[0,0,0,0]\
        header: Group\
        {\
            orientation:'column',\
            alignment:['center','top'],\
            margins:[0,0,0,0]\
            title: Image\
            {\
                icon:'" + this.resources.header.path + '/' + this.resources.header.name + "',\
                preferredSize: [175, 35]},\
                ver: StaticText\
                {\
                    text:'" + this.info.ver + "',\
                    alignment:['center','center']\
                }\
                desc: StaticText\
                {\
                    text:'" + this.info.description + "',\
                    alignment:['center','center']\
                },\
        },\
        main: Group\
        {\
            orientation:'column',\
            alignment:['fill','fill'],\
            alignChildren:['center','center'],\
        },\
        footer: Group\
        {\
        alignment:['center','bottom'], \
                icn_app: Image {icon:'" + this.resources.icon.path + '/' + this.resources.icon.name + "',preferredSize: [15, 18]},\
                txt_info: StaticText { text:'"+ this.info.url + "', alignment:['fill','center'] },\
            }, \
        }";
        this.window.grp = this.window.add( res );
        this.window.layout.layout(true);
        
        this.customizeUI();
        
        //EventHandlerAssignment
        this.window.onResize = this.resize;
        this.window.onClose = this.close;
    },
    customizeUI : function customizeUI()
    {
        var g  = this.window.graphics;    
        var orange = g.newBrush(g.BrushType.SOLID_COLOR, [1, .45, 0, 1]);    
        this.window.grp.main.graphics.backgroundColor = orange;
    },
    //EVENT HANDLERS
    resize : function resize()
    {
        this.layout.resize();
    },
    close : function close()
    {
        delete this;
    },
    init : function init()
    {
        this.window = ( scriptUIPanel instanceof Panel ) ? scriptUIPanel: new Window( "palette" , this.info.name , undefined, { resizeable : true } );
        this.createUI();
    }
    
};
//delete scriptUIPanel;
/*
function yToolBox(thisObj){
    
    YTB = new Object();
    YTB.icon = new File('../yScripts/yNet.png');
    YTB.header = new File('../yScripts/header.png');
    YTB.info = 'yorchnet.com';
    YTB.name ='yToolBox';
    YTB.ver ='0.4.2.1 alpha';
    YTB.desc='Working tools so far...';
    
    YTB.buttonWidth=126;
    YTB.buttonHeight=30;
    
    YTB.tools = [];

    #include "../yScripts/y_JSExtensions.jsx";

    //INCLUDED TOOLS
    #include "../yScripts/y_setStructure.jsx";
    #include "../yScripts/y_puppetRig.jsx";
    #include "../yScripts/y_colorProbe.jsx";
    #include "../yScripts/y_yBindBetween2.jsx";
    #include "../yScripts/y_stopMotionLayer.jsx";
    #include "../yScripts/y_CornerPin.jsx";    
    

    YTB.window = (thisObj instanceof Panel) ? thisObj : new Window("palette", YTB.info , undefined, {resizeable:true});


    //MAIN WINDOW STRUCTURE.
    var res_header ="group { orientation:'column', alignment:['fill','fill'],margins:[0,0,0,0] \
        header: Group { orientation:'column', alignment:['center','top'],margins:[0,0,0,0]\
            title: Image {icon:'"+YTB.header.path+'/'+YTB.header.name+"',preferredSize: [175, 35]},\
            ver: StaticText { text:'"+YTB.ver+"', alignment:['center','center']}\
           desc: StaticText { text:'"+YTB.desc+"', alignment:['center','center']}, \
        }, \
        main: Group { orientation:'column',alignment:['fill','fill'], alignChildren:['center','center'],"
    var res = ""; //To be populated with the included Tools
    var res_footer ="}, \
        cmds: Group { alignment:['center','bottom'], \
            icn_app: Image {icon:'"+ YTB.icon.path+'/'+ YTB.icon.name+"',preferredSize: [15, 18]},\
            txt_info: StaticText { text:'"+YTB.info+"', alignment:['fill','center'] },\
        }, \
    }";

    //POPULATE res with included tools.
    for (i=0;i<YTB.tools.length;i++){
        res = res + YTB.tools [i].btnLayout;
    }

    //LAYOUT Stuff
    YTB.window.grp = YTB.window.add(res_header+res+res_footer);
    YTB.window.layout.layout(true);
    YTB.window.onResize = resize;
    YTB.window.onClose = function () {delete YTB;};
    
   //ASSIGN buttons to the activate function of each tool;
   var toolBtns = YTB.window.grp.main.children;
    for(n=0;n<toolBtns.length;n++){
        toolBtns[n].onClick=YTB.tools[n].activate;
    }
    
    return YTB.window
}

function resize(){
    this.layout.resize();
    customize;
    }

function customize(){
    g  = YTB.window.grp.main.graphics;
    
    myFont = ScriptUI.newFont('Cooper Std Black',ScriptUI.FontStyle.REGULAR ,14 );   
    myBrush = g.newBrush(g.BrushType.SOLID_COLOR, [1, .45, 0, 1]);    
    
   
    g.backgroundColor = myBrush;
    g  = YTB.window.grp.header.title.graphics;
    g.font = myFont;

    g =YTB.window.grp.header.graphics;
    g.backgroundColor = myBrush;
    
    }

yToolBox(this);

YTB.window.grp.onDraw = resize;
YTB.window.grp.onDraw = customize;
*/
YTB.init();
\ No newline at end of file
+var scriptUIPanel = this;
YTB =
{   
    info :
    {
        name : "yToolBox",
        ver : 0.5,
        status : "alpha",
        url : "yorchnet.com",
        description : "My mixed bag of tools"
    },
    resources :
    {
        icon : new File('../yScripts/yNet.png'),
        header :  new File('../yScripts/header.png')
    },
    appearence :
    {
      buttonHeight : 30,
      buttonWidth : 126  
    },
    tools : [],
    createUI : function createUI()
    {
        var res ="group\
        {\
        orientation:'column',\
        alignment:['fill','fill'],\
        margins:[0,0,0,0]\
        header: Group\
        {\
            orientation:'column',\
            alignment:['center','top'],\
            margins:[0,0,0,0]\
            title: Image\
            {\
                icon:'" + this.resources.header.path + '/' + this.resources.header.name + "',\
                preferredSize: [175, 35]},\
                ver: StaticText\
                {\
                    text:'" + this.info.ver + "',\
                    alignment:['center','center']\
                }\
                desc: StaticText\
                {\
                    text:'" + this.info.description + "',\
                    alignment:['center','center']\
                },\
        },\
        main: Group\
        {\
            orientation:'column',\
            alignment:['fill','fill'],\
            alignChildren:['center','center'],\
        },\
        footer: Group\
        {\
        alignment:['center','bottom'], \
                icn_app: Image {icon:'" + this.resources.icon.path + '/' + this.resources.icon.name + "',preferredSize: [15, 18]},\
                txt_info: StaticText { text:'"+ this.info.url + "', alignment:['fill','center'] },\
            }, \
        }";
        this.window.grp = this.window.add( res );
        
        this.window.layout.layout(true);
        this.customizeUI();
        
        //EventHandlerAssignment
        this.window.onResize = this.resize;
        this.window.onClose = this.close;
        this.window.onDraw = this.autoLayout;
    },
    customizeUI : function customizeUI()
    {
        var g  = this.window.graphics;    
        var orange = g.newBrush(g.BrushType.SOLID_COLOR, [1, .45, 0, 1]);    
        this.window.grp.main.graphics.backgroundColor = orange;
    },
    addTool : function addTool( aTool )
    {
        /**** TO DO ****/
        // Check that the tool object is unique.
        // Call for a window resize so it refreshes propperly.
        
        this.tools.push( aTool );

        var btn  = this.window.grp.main.add( aTool.btnLauyout );
        
        btn.onClick = aTool.activate;

        this.window.layout.layout(true);
        
    },
    //EVENT HANDLERS
    resize : function resize()
    {
        this.layout.resize();
    },
    close : function close()
    {
        delete this;
    },
    init : function init()
    {
        this.window = ( scriptUIPanel instanceof Panel ) ? scriptUIPanel: new Window( "palette" , this.info.name , undefined, { resizeable : true } );
        this.createUI();
    }
    
};

YTB.init();
\ No newline at end of file
diff --git a/yScripts/y_setStructure.jsx b/yScripts/y_setStructure.jsx
index 3eebf6c..4a62040 100755
--- a/yScripts/y_setStructure.jsx
+++ b/yScripts/y_setStructure.jsx
@@ -1,83 +1,121 @@
 #include "../yScripts/y_JSExtensions.jsx";
-
-ySetProject_data = new Object();
-
-ySetProject_data.scriptName = 'YSetStructure';
-ySetProject_data.scriptDesc = 'Set the Folder Structure for a new Project';
-ySetProject_data.scriptVer = '0.1a';
-ySetProject_data.webLink = 'yorchnet.com';
-
-//if yToolBox Exists add it to its tool list.
-if (typeof(YTB)!=='undefined'){
-    YTB.tools.push(ySetProject_data);
-    
-    //it should be called from toolbox.
-    /*
-     ySetProject_data.buttonWidth=76;
-     ySetProject_data.buttonHeight=30;
-     */
-     ySetProject_data.btnLayout = "btn_"+ ySetProject_data.scriptName+": Button { preferredSize: ['"+ YTB.buttonWidth+"','"+ YTB.buttonHeight+"'], text:'"+ySetProject_data.scriptName+"', helpTip:'"+ySetProject_data.scriptDesc+"' }";
-    
+function YSetProjectTool()
+{
+    this.info =
+    {
+	name : "YSetStructure",
+	version : 0.11,
+	stage : "alpha",
+	description : "Set the Folder Structure for a new Project",
+	url : "yorchnet.com"
+    };
+    this.appearence =
+    {
+	buttonHeight : 30,
+	buttonWidth : 126
+    };
+    this.init = function init()
+    {
+	alert("my name is:" + this.info.name);
+	this.btnLauyout = 
+	"button\
+	 {\
+	    preferredSize: ['" + this.appearence.buttonWidth + "','" + this.appearence.buttonHeight + "'],\
+	    text:'" + this.info.name + "',\
+	    helpTip:'" + this.info.description + "'\
+	 }";
+	
+	this. res = 
+	 "window\
+	{\
+	    type:'palette',\
+	    text:'" + this.info.name + ' ' + this.info.ver + ' ' + this.info.stage + "',\
+	    info: Group \
+	    {\
+		alignment:['center','bottom'],\
+		icon: Image \
+		{\
+		    preferredSize: [15, 18]\
+		},\
+		website: StaticText\
+		{\
+		    text:'" + this.info.url + "',\
+		    alignment:['fill','center']\
+		},\
+	    }\
+	}";
     }
-
-ySetProject_data.res = "window { \
-    type:'palette' , text:'"+ySetProject_data.scriptName+' '+ySetProject_data.scriptVer+"',\
-    \
-    \
-    info: Group { \
-        alignment:['center','bottom'], \
-        icon: Image {preferredSize: [15, 18]},\
-			website: StaticText { text:'"+ySetProject_data.webLink+"', alignment:['fill','center'] },\
-        }\
-    \
-    }";
-    
-//------------------------------------------------------------------------------------------------------------------------
-function ySetProject(){
+    this.ySetProject = function ySetProject()
+    {
+	alert("is this working");
 	app.beginUndoGroup('ySetProject');
-var preStruct = ["01 MAIN","02 PComp","03 Source Layers" ,"04 Movies","05 Other Projects","06 Audio" , "07 Reference"];
-var newStruct = [];
-var projectItems = [];
+	var preStruct = ["01 MAIN","02 PComp","03 Source Layers" ,"04 Movies","05 Other Projects","06 Audio" , "07 Reference"];
+	var newStruct = [];
+	var projectItems = [];
 
-for(i=1;i<=app.project.items.length;i++){
-    if(app.project.items[i].parentFolder.name=='Root'){
-	projectItems.push(app.project.items[i].name);
+	for(i=1;i<=app.project.items.length;i++)
+	{
+	    if(app.project.items[i].parentFolder.name=='Root')
+	    {
+		projectItems.push(app.project.items[i].name);
+	    }
 	}
-    }
 
-//to start a new organized project since the beginning
+	//to start a new organized project since the beginning
 
-if (projectItems.length == 0){
-	newStruct = preStruct;
-	}else{
-		for(a=0;a<preStruct.length;a++){
-			if ((projectItems.getOne(preStruct[a]))==-1){
-				newStruct.push(preStruct[a]);
-				};
+	if (projectItems.length == 0)
+	{
+	    newStruct = preStruct;
+	}
+	else
+	{
+	    for(a=0;a<preStruct.length;a++)
+	    {
+		if ((projectItems.getOne(preStruct[a]))==-1)
+		{
+		    newStruct.push(preStruct[a]);
 		}
+	    }
+	}
+
+	for(i = 0;i<newStruct.length;i++)
+	{
+	    app.project.items.addFolder(newStruct[i]);
+	}
+	
+	saveNow = confirm("Project Succesfully Set, Save Project?",true,"ySetProject");
+	
+	if(saveNow==true){
+	    app.project.save()
+	}else{
+	    
+	}
+	app.endUndoGroup();
+    }
+    
+    this.activate = this.ySetProject;
+    
+    this.init();
+    return this;
 }
 
+//------------------------------------------------------------------------------------------------------------------------
 
-for(i = 0;i<newStruct.length;i++){
-	app.project.items.addFolder(newStruct[i]);
-}
-saveNow = confirm("Project Succesfully Set, Save Project?",true,"ySetProject");
-if(saveNow==true){
-app.project.save()
-}else{
-}
-app.endUndoGroup();
-}
 //------------------------------------------------------------------------------------------------------------------------
 
-function build_ySetProject_data_UI(){
-	ySetProject_data.window = new Window ( ySetProject_data.res);
-	ySetProject_data.window.show();
-	}
-ySetProject_data.activate = ySetProject ;
+function build_ySetProject_data_UI()
+{
+    ySetProject_data.window = new Window ( ySetProject_data.res );
+    ySetProject_data.window.show();
+}
 
 //CHECKS that the toolbox exists, and if it doesn´t it runs the script on its own.
-if (typeof(YTB)=='undefined'){
-        ySetProject_data.activate();
-	}else{
-    }
+if (typeof(YTB)=='undefined')
+{
+    ySetProject_data = new YSetProjectTool();
+    ySetProject_data.activate();
+}
+else
+{
+    YTB.addTool(new YSetProjectTool());
+}