Reorganized Server Framework to be more Idiomatic