moved implementation into correct namespace
code clean