Moved 'tools' directory and made it a namespace