Improve password handling
Remove unneccessary namespaces
Adjust namespaces and improve error handling