Fixed some mess
Changed some namespaces