Fixing server class namespace