Moved code to toolkit project