put some classes insubnamespaces + fix for clang