Collapsed the namespace
Fixed build