Added structure to toolkit