Added Tools project and moved projects into folders