Use nested namespace declarations

Use nested namespace declarations #680