Got all to use namespace within their cpp files