Refactored Server into server hierarchy
Fixed merge conflicts due to package movement/renaming