Matcha::connect - Moving some files, and fixing some typos.
Fixing