Replacing class namespace with module namespace