converting everything to just one namespace