tidied toolbox
re-factor site variables, sandbox and structure