Added name spaces

Signed-off-by: haggi <git@haggi.de>