Moves class to proper namespace
More namespace updates