Revert "Revert "Basic server classes updated.""

This reverts commit 665da96e6087f4ed5b0c7ea82fd016f15614aae4.