Creating some base classes for servers
Merge branch 'reorder'